summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-08-021-1/+0
|
* Propagate exceptions in OC.appSettings.Thomas Tanghus2012-08-011-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-08-011-0/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-3147-101/+702
|
* Forgot to also use the options I added :-PThomas Tanghus2012-07-311-1/+1
|
* Added some more options to OC.appSettings().Thomas Tanghus2012-07-311-2/+33
|
* Made the parameter for OC.appSettings() an object to be able to extend it.Thomas Tanghus2012-07-311-2/+5
|
* White spaceThomas Tanghus2012-07-311-7/+6
|
* Popup for app specific settings.Thomas Tanghus2012-07-312-16/+48
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-302-12/+48
|
* Tweak appearance of undo delete notificationMichael Gapczynski2012-07-291-1/+1
|
* fix for bug #1295, don't escape password reset linkBjoern Schiessle2012-07-271-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-271-0/+35
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-0/+64
|
* Updated styleLukas Reschke2012-07-261-1/+1
|
* Remove unused filesLukas Reschke2012-07-262-84/+0
|
* Check for admin userLukas Reschke2012-07-261-0/+1
|
* CSRF protection for eventsourceRobin Appelman2012-07-222-0/+2
|
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-211-1/+1
|\
| * remove second "autocomplete" statementBjoern Schiessle2012-07-181-1/+1
| |
| * remember username and provide autocomplete featureBjoern Schiessle2012-07-181-1/+1
| |
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-119-15/+1
|\|
| * remove superfluous ?> at the end of .php files (left out apps/*/templates)Jörn Friedrich Dreyer2012-07-098-14/+0
| |
| * Fix time formatting for minutes, prepend 0 if minutes is less than 10Michael Gapczynski2012-07-061-1/+1
| |
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-041-0/+2
|\|
| * Add slash to app url if not set fix oc-1169Brice Maron2012-07-031-0/+2
| |
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-301-3/+15
|\|
| * Prevent adding a duplicate to a multiselectMichael Gapczynski2012-06-291-1/+12
| |
| * Add new group to other user's group select formsMichael Gapczynski2012-06-291-2/+3
| |
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-263-2/+3
|\|
| * typo in js statement fixedBjoern Schiessle2012-06-261-1/+1
| |
| * Added text ACS warning to admin's user settings page, and corresponding CSS ↵Sam Tuke2012-06-251-0/+1
| | | | | | | | styles
| * add x-webkit-speech to searchboxGeorg Ehrke2012-06-241-1/+1
| |
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-224-10/+7
|\|
| * Fixes for multi app dir :Brice Maron2012-06-221-2/+1
| | | | | | | | | | Url should be given as relative path (to webroot) Correct link construction from js
| * Merge branch 'master' into multi_app_dirBrice Maron2012-06-214-16/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php
| | * use new sanitizeHTML() functionBjoern Schiessle2012-06-212-2/+2
| | |
| * | Merge branch 'master' into multi_app_dirBrice Maron2012-06-146-10/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
| * \ \ Merge branch 'master' into multi_app_dirBrice Maron2012-06-071-1/+0
| |\ \ \
| * | | | Change app path logic in templatesBrice Maron2012-06-063-8/+5
| | | | |
| * | | | Unit path and webpath, correct some moreBrice Maron2012-06-061-1/+2
| | | | |
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-192-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | CSS class headerAction -> header-actionFlorian Hülsmann2012-06-182-3/+3
| | | | |
| * | | | added CSS class .headerActionFlorian Hülsmann2012-06-181-2/+2
| | | | |
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-181-2/+2
|\| | | |
| * | | | Use TemplateLayout functions for finding js and css files in minimizerBart Visscher2012-06-181-2/+2
| | | | |
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-183-10/+9
|\| | | |
| * | | | corrected header width and floating (can now dynamically add stuff to ↵Florian Hülsmann2012-06-182-8/+7
| | | | | | | | | | | | | | | | | | | | header); someone may test this in IE
| * | | | Cache the minimized output also on the serverBart Visscher2012-06-181-2/+2
| | | | |
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-171-0/+1
|\| | | |