Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Also allow local files | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
| | |||||
* | Allow the loading of local font files embedded via data: | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
| | |||||
* | Allow loading of external fonts | Lukas Reschke | 2013-02-04 | 2 | -2/+2 |
| | | | | Required by several applications like our pdf viewer | ||||
* | fix CSS to coding guideline | Jan-Christoph Borchardt | 2013-02-03 | 1 | -0/+13 |
| | |||||
* | Password Toggle Support for Login | raghunayyar | 2013-02-03 | 5 | -4/+76 |
| | |||||
* | Merge pull request #1416 from herbrechtsmeier/set_include_path_early | Thomas Müller | 2013-02-03 | 1 | -6/+7 |
|\ | | | | | initPaths: set include path before any owncloud function is called | ||||
| * | initPaths: set include path before any owncloud function is called | herbrechtsmeier | 2013-02-02 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | Ensure we can find basic owncloud classes while detecting the owncloud paths in function initPaths by add OC::$SERVERROOT . '/lib' to include path before any owncloud function is called. This fix a bug with XAMPP that cannot find the class OC_Config in function OC_Request::scriptName when called from function OC_Base::initPaths. | ||||
* | | Merge pull request #1422 from TheSFReader/master | Thomas Müller | 2013-02-03 | 2 | -2/+3 |
|\ \ | | | | | | | Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming | ||||
| * | | Remove a warning by making sure the renamed file is a dir before trying and ↵ | TheSFReader | 2013-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | opening it | ||||
| * | | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-02 | 384 | -2276/+2477 |
| |\| | |||||
| * | | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-01 | 373 | -7004/+14837 |
| |\ \ | |||||
| * | | | Correct it | TheSFReader | 2013-02-01 | 1 | -1/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 148 | -4161/+5013 |
| | | | | |||||
* | | | | Merge pull request #1419 from owncloud/etag_fix | Thomas Müller | 2013-02-02 | 2 | -2/+6 |
|\ \ \ \ | |_|_|/ |/| | | | Dav: don't overwrite etag from filecache with old etag from properties table | ||||
| * | | | Dav: update etag in filecache when doing a PROPSET | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
| | | | | |||||
| * | | | Dav: don't overwrite etag from filecache with old etag from properties table | Robin Appelman | 2013-02-02 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #1415 from owncloud/ldap_fix_settings | Lukas Reschke | 2013-02-01 | 2 | -20/+32 |
|\ \ \ | | | | | | | | | LDAP settings Advanced tab has grown too long by far. Structure it using accordion. | ||||
| * | | | remove ugly whitespace | Arthur Schiwon | 2013-02-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | LDAP: settings Advanced tab has grown too long by far. Structure it using ↵ | Arthur Schiwon | 2013-02-01 | 2 | -20/+32 |
| | |/ | |/| | | | | | | | accordion | ||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 382 | -2256/+2445 |
|/ / | |||||
* | | Merge pull request #1413 from owncloud/enable_removing_search_providers | Frank Karlitschek | 2013-02-01 | 1 | -0/+16 |
|\ \ | | | | | | | add function to remove a search provider | ||||
| * | | add function to remove a search provider | Jörn Friedrich Dreyer | 2013-02-01 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #1395 from raghunayyar/webkit-scrollbar-534 | Jan-Christoph Borchardt | 2013-02-01 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Adds webkit scrollbar to ownCloud | ||||
| * | | | More Visible webkit Scrollbar, syntax error solved. | raghunayyar | 2013-02-01 | 1 | -3/+3 |
| | | | | |||||
| * | | | Adds webkit scrollbar to ownCloud | raghunayyar | 2013-01-31 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #1384 from owncloud/upgrade_fix | Bart Visscher | 2013-02-01 | 1 | -70/+53 |
|\ \ \ \ | | | | | | | | | | | Check for upgrade/maintance mode before trying to load an app | ||||
| * | | | | Still load js files in maintance mode | Robin Appelman | 2013-01-30 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Check for upgrade/maintance mode before trying to load an app | Robin Appelman | 2013-01-30 | 1 | -70/+49 |
| | | | | | |||||
* | | | | | Merge pull request #1404 from owncloud/fixing-1276-master | blizzz | 2013-02-01 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | fix #1276 - use registerLoadedCallback() | ||||
| * | | | | | fix #1276 - use registerLoadedCallback() | Thomas Mueller | 2013-02-01 | 1 | -3/+4 |
| | | | | | | |||||
* | | | | | | Updateing -> Updating | Thomas Mueller | 2013-02-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | undelete -> restore | Thomas Mueller | 2013-02-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-01 | 326 | -3231/+13981 |
| | | | | | | |||||
* | | | | | | fix breadcrumbs for gallery and texteditor | Robin Appelman | 2013-02-01 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #1171 from owncloud/move-datadirectory-checks | Thomas Müller | 2013-01-31 | 1 | -30/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Move data directory permission checks after data directory existence checks | ||||
| * \ \ \ \ | Merge branch 'master' into move-datadirectory-checks | Michael Gapczynski | 2013-01-18 | 622 | -6831/+6456 |
| |\ \ \ \ \ | |||||
| * | | | | | | Move permissions check to new function checkDataDirectoryPermissions() | Michael Gapczynski | 2013-01-18 | 1 | -28/+27 |
| | | | | | | | |||||
| * | | | | | | Move data directory permission checks after data directory existence checks | Michael Gapczynski | 2013-01-12 | 1 | -29/+28 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1287 from owncloud/ocs_xml_attributes | Thomas Müller | 2013-01-31 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | API: Treat array keys starting with '@' as XML attributes | ||||
| * | | | | | | | Simpler method for getting the first char | Tom Needham | 2013-01-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Remove some whitespace | Tom Needham | 2013-01-24 | 1 | -4/+0 |
| | | | | | | | | |||||
| * | | | | | | | API: If key begins with '@' treat it as an xml attribute | Tom Needham | 2013-01-24 | 1 | -2/+9 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1351 from owncloud/navigation | Michael Gapczynski | 2013-01-31 | 31 | -3653/+583 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | New navigation design | ||||
| * | | | | | | | | use translate string for Log out, remove title | Jan-Christoph Borchardt | 2013-01-31 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix svg fallback replacement for settings icons | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix header for shared links | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 297 | -2910/+7811 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 473 | -7499/+10484 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | increase opacity of inactive apps and settings entries for better visibility | Jan-Christoph Borchardt | 2013-01-31 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | vertical scrollbar for app navigation when too many apps | Jan-Christoph Borchardt | 2013-01-31 | 1 | -1/+6 |
| | | | | | | | | | |