summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Add slash to app url if not set fix oc-1169Brice Maron2012-07-031-0/+2
|
* 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
|
* 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
|
* 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
| |
| * CSS class headerAction -> header-actionFlorian Hülsmann2012-06-182-3/+3
| |
| * added CSS class .headerActionFlorian Hülsmann2012-06-181-2/+2
| |
| * Use TemplateLayout functions for finding js and css files in minimizerBart Visscher2012-06-181-2/+2
| |
| * 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
| |
| * Add session_write_close to the minimizerBart Visscher2012-06-161-0/+1
| |
* | 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
| * Make requesttoken global.Thomas Tanghus2012-06-141-1/+1
| |
| * Merge commit 'refs/merge-requests/127' of ↵Michael Gapczynski2012-06-132-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/127 Conflicts: apps/files_external/templates/settings.php lib/template.php
| | * Removed some unessecary sanitizationsLukas Reschke2012-06-111-1/+1
| | |
| | * Make some apps compatibleLukas Reschke2012-06-111-1/+1
| | |
| * | Added JSON methods for CSRF prevention. Make request token accessible from ↵Thomas Tanghus2012-06-131-0/+10
| | | | | | | | | | | | template and add js var.
| * | urlencode link fort password reset (bug #970)Bjoern Schiessle2012-06-131-1/+1
| |/
| * fix potential xss in multiselectRobin Appelman2012-06-091-3/+9
| |
| * Better handling of core.css and core.jsBart Visscher2012-06-072-4/+4
| | | | | | | | | | Fixes calling remote.php on install. Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
* | Merge branch 'master' into multi_app_dirBrice Maron2012-06-071-1/+0
|\|
| * Remove old internal mail call for password reset, fixes bug oc-934Michael Gapczynski2012-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
|/
* update translationsRobin Appelman2012-06-0616-25/+188
|
* Fix remap dir for CSS minimizerBart Visscher2012-06-051-1/+1
|
* Load apps before minimizing the core css and jsBart Visscher2012-06-041-0/+2
|
* Merge branch 'unstable'Bart Visscher2012-06-043-0/+24
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/tests/config.php apps/files_versions/ajax/getVersions.php apps/files_versions/appinfo/app.php apps/files_versions/history.php apps/files_versions/js/versions.js apps/files_versions/templates/history.php apps/files_versions/versions.php lib/base.php
| * Combine and minimize core and default app js filesBart Visscher2012-05-163-3/+16
| |
| * Combine and minimize core and default app css filesBart Visscher2012-05-163-0/+11
| |
* | use our own serverHost call so that ownCloud works with reverse proxy serversFrank Karlitschek2012-05-311-1/+1
| |
* | update copyrightFrank Karlitschek2012-05-262-2/+2
| |
* | oc-657: icons for M$ office file typesThomas Mueller2012-05-213-0/+0
| |
* | add htmlentities() call into login formMichiel de Jong2012-05-181-1/+1
| |
* | Merge commit 'refs/merge-requests/115' of ↵Michael Gapczynski2012-05-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/115 Conflicts: apps/files/templates/index.php
| * | Fix some non-utf8-friendly htmlentities (resulting in wrong display of ↵Vitaly Kuznetsov2012-05-101-1/+1
| |/ | | | | | | utf8-encoded directory names for example)
* | only check our own input fields when determining to show the login buttonRobin Appelman2012-05-171-2/+2
| | | | | | | | fixes a problem with browser plugins adding hidden inputs
* | update translationsRobin Appelman2012-05-176-1/+81
| |
* | move auth.css and remoteStorage-big.png to assets folders From where they ↵Michiel de Jong2012-05-142-0/+8
| | | | | | | | can be included
* | Sanitize search queries, thanks to Lukas ReschkeMichael Gapczynski2012-05-131-1/+1
| |
* | update translationsRobin Appelman2012-05-1318-4/+136
| |
* | update to jquery 1.7.2Robin Appelman2012-05-122-4/+4
| |
* | Remove duplicate lineBart Visscher2012-05-111-1/+0
| |
* | fixed settings text not being clickableJan-Christoph Borchardt2012-05-111-2/+2
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 21:33:59 +0000