Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1419 from owncloud/etag_fix | Thomas Müller | 2013-02-02 | 2 | -2/+6 |
|\ | |||||
| * | 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 |
|\ | |||||
| * | remove ugly whitespace | Arthur Schiwon | 2013-02-01 | 1 | -1/+1 |
| * | LDAP: settings Advanced tab has grown too long by far. Structure it using acc... | Arthur Schiwon | 2013-02-01 | 2 | -20/+32 |
* | | [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 | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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() | 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 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| * | | | | | | | | | ellipsize long app names in navigation | Jan-Christoph Borchardt | 2013-01-31 | 1 | -0/+1 |
| * | | | | | | | | | Merge pull request #1359 from raghunayyar/navigation | Jan-Christoph Borchardt | 2013-01-31 | 2 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Shorter, Cleaner JS in apps.js | raghunayyar | 2013-01-31 | 1 | -8/+4 |
| | * | | | | | | | | | Reduced Styling and Image loads as from src and not backgorund. | raghunayyar | 2013-01-30 | 2 | -3/+5 |
| | * | | | | | | | | | No Image Repetition on Enabling Apps in Navigation Bar | raghunayyar | 2013-01-30 | 2 | -1/+9 |
| * | | | | | | | | | | use new user function to display real name if available, username still fallback | Jan-Christoph Borchardt | 2013-01-30 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-30 | 326 | -9711/+11697 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge styles | Jan-Christoph Borchardt | 2013-01-28 | 561 | -9220/+31818 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | update Files icon from home to files, update Home icon from checkbox to home | Jan-Christoph Borchardt | 2013-01-28 | 4 | -34/+78 |
| * | | | | | | | | | | | | undo padding change on buttons, otherwise it will mess up the upload and new ... | Jan-Christoph Borchardt | 2013-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | merge changes in navigation | Jan-Christoph Borchardt | 2013-01-28 | 3 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | More Style Fixes | raghunayyar | 2013-01-25 | 1 | -2/+1 |
| | * | | | | | | | | | | | Defined height for #leftcontent | raghunayyar | 2013-01-25 | 2 | -2/+2 |