Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | Fix merge conflicts from salinasv which git didn't tell me about... | Barrucadu | 2009-05-19 | |
| | | ||||
* | | merge in from salinasv | Barrucadu | 2009-05-19 | |
| | | | | | | | | | | | | | | Conflicts: uzbl.c uzbl.h | |||
* | | Merge branch 'experimental' of git://github.com/DuClare/uzbl into experimental | Barrucadu | 2009-05-19 | |
|\| | | | | | | | | | Conflicts: uzbl.c | |||
| * | Merge commit 'rob/master' into experimental | DuClare | 2009-05-19 | |
| |\ | | | | | | | | | | | | | | | | | | | Also fixed a ptr bug in set_var_value. Conflicts: uzbl.c | |||
* | | | Moved key_press_cb callback to the main window rather than webkit, to fix ↵ | Barrucadu | 2009-05-19 | |
| | | | | | | | | | | | | this: http://www.uzbl.org/bugs/index.php?do=details&task_id=15 | |||
| | * | converted all variable commands to the callback system, get rid of var_is | Robert Manea | 2009-05-19 | |
| | | | ||||
* | | | Modified read_file_by_line to return a GArray, and allow files of more than ↵ | Barrucadu | 2009-05-19 | |
| | | | | | | | | | | | | 512 lines by getting rid of that horrible magic number. | |||
| | * | added callback based uzbl commands | Robert Manea | 2009-05-19 | |
| | | | ||||
* | | | Merge branch 'experimental' of git://github.com/DuClare/uzbl into experimental | Barrucadu | 2009-05-19 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: uzbl.c uzbl.h This breaks run_external_js() - segfault | |||
| * | | Disable splitting for some actions, fix sampleconfig-dev | DuClare | 2009-05-19 | |
| | | | ||||
* | | | Revert "Merge branch 'dieter/experimental' into experimental" | Barrucadu | 2009-05-19 | |
| | | | | | | | | | | | | | | | This reverts commit 992230601106aadf0146cb022cd240136ae2f261, reversing changes made to 7e301b27e4e61e0c1bd1bc40f1008608969033e6. | |||
| * | | Finish argv, fix sampleconfig-dev | DuClare | 2009-05-19 | |
| | | | ||||
* | | | Merge commit 'duc/experimental' into experimental | Barrucadu | 2009-05-19 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: examples/configs/sampleconfig-dev | |||
| | * | Argv stub | DuClare | 2009-05-19 | |
| |/ | ||||
| * | Merge commit 'diet/experimental' into experimental | DuClare | 2009-05-19 | |
| |\ | ||||
| * | | Add load_start_handler | DuClare | 2009-05-19 | |
| | | | ||||
| * | | Allow splitting wo/unescaping, add load_commit_handler, fix run_handler | DuClare | 2009-05-19 | |
| | | | ||||
* | | | Merge branch 'dieter/experimental' into experimental | Barrucadu | 2009-05-18 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: uzbl.c uzbl.h | |||
* | | | Added read_file_by_line() function | Barrucadu | 2009-05-18 | |
| | | | ||||
| * | | merge in from salinasv | Dieter Plaetinck | 2009-05-18 | |
| |\ \ | ||||
* | | | | Renamed "script" to "js". | Barrucadu | 2009-05-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "script" command which executes an external JS file. Moved hinting to an external JS file. I renamed "script" to "js" because we use "sh" for one-line *sh scripts, so "js" for one-line JS scripts is nice and consistent. | |||
| | | * | Merge branch 'quotes' into experimental | DuClare | 2009-05-18 | |
| | |/| | |/| | | ||||
* | | | | Changed "gchar searchxold[500]" to "gchar *searchold" and now use ↵ | Barrucadu | 2009-05-18 | |
| | | | | | | | | | | | | | | | | "g_strdup()" instead of "strcpy()". | |||
* | | | | Fix for massive CPU usage when searching big pages for the same term | Barrucadu | 2009-05-18 | |
| | | | | ||||
* | | | | Added support for environmental variables in SET and BIND commands. | Barrucadu | 2009-05-18 | |
| | | | | ||||
| | | * | Fix spawn.sh, let run_command have n args before defaults | DuClare | 2009-05-18 | |
| | | | | ||||
| | | * | Remove bunches of old code, fix run_handler, free some stuff | DuClare | 2009-05-18 | |
| | | | | ||||
| * | | | fixed control_stdin to recognize all input | Robert Manea | 2009-05-18 | |
| | | | | ||||
| | | * | Add split_quoted, use the safer functions in run_command, break stuff | DuClare | 2009-05-18 | |
| | |/ | |/| | ||||
* / | | Changed insert_mode into toggle_insert_mode. | Barrucadu | 2009-05-17 | |
|/ / | ||||
| * | Dinamically alloc state strings. | salinasv | 2009-05-17 | |
|/ | ||||
* | cleanup after merging in from splattael | Dieter Plaetinck | 2009-05-17 | |
| | ||||
* | Search reverse. Use vim keys (n, N and /, ?). | Peter Suschlik | 2009-05-17 | |
| | ||||
* | SELECTED_URI variable + allow variable replacing in window title in both states | Dieter Plaetinck | 2009-05-17 | |
| | ||||
* | merge in Duclares stuff | Dieter Plaetinck | 2009-05-16 | |
|\ | ||||
* | | Reimplemented my changes: | Barrucadu | 2009-05-16 | |
| | | | | | | | | | | | | - str_replace function - get_xdg_var and xdg_find_file fo finding files using the XDG basedir spec - Implementation of -v, so most messages are suppressed | |||
| * | Add action: sh, add var: shell_cmd | DuClare | 2009-05-16 | |
| | | ||||
| * | Add variable: minimum_font_size | DuClare | 2009-05-16 | |
| | | ||||
| * | Add variable: default_font_size | DuClare | 2009-05-16 | |
|/ | ||||
* | merge in Damien Leones stuff | Dieter Plaetinck | 2009-05-16 | |
|\ | ||||
* \ | merge in Duclares stuff | Dieter Plaetinck | 2009-05-16 | |
|\ \ | ||||
| | * | clean traling whitespaces | Damien Leone | 2009-05-16 | |
| |/ |/| | ||||
| * | Merge run_command_sync and run_command_async to run_command | DuClare | 2009-05-16 | |
| | | ||||
| * | Rename CMD to ACT for clarity | DuClare | 2009-05-16 | |
| | | ||||
| * | Move execution from key_press_cb to its own function, run_keycmd. | DuClare | 2009-05-16 | |
| | | ||||
* | | fix return for control_socket | Dieter Plaetinck | 2009-05-16 | |
| | | ||||
* | | Merge branch 'config-refactor' of git://github.com/Dieterbe/uzbl into ↵ | Robert Manea | 2009-05-15 | |
|\ \ | | | | | | | | | | config-refactor | |||
| | * | Revert "Fix warnings caused by casts between ints and pointers on 64bit" | DuClare | 2009-05-15 | |
| | | | | | | | | | | | | | | | This reverts commit 4293a258255849854670ce12de428581904a1a24. The fix had introduced regressions on 32bit :< | |||
| | * | Fix warnings caused by casts between ints and pointers on 64bit | DuClare | 2009-05-15 | |
| | | | ||||
| | * | Merge commit 'rob/config-refactor' into experimental | DuClare | 2009-05-15 | |
| |/| | |/ |/| |