summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18042 from GreenArchon/masterMorris Jobke2015-08-262-7/+35
|\
| * fix more review comments for #18042 / #17759Frédéric Fortier2015-08-071-4/+3
| * Take review comments into consideration for pr #18042 / issue #17759Frédéric Fortier2015-08-041-16/+13
| * Properly nest groups when using memberOf to detect group membership, fixes #1...Frédéric Fortier2015-08-032-7/+39
* | [tx-robot] updated from transifexJenkins for ownCloud2015-08-2626-4/+200
* | adjust dropdown borders to button bordersChristoph Wurst2015-08-251-1/+1
* | Merge pull request #18564 from owncloud/fix-transifex-syncMorris Jobke2015-08-25542-4204/+3660
|\ \
| * | [tx-robot] updated from transifexJenkins for ownCloud2015-08-25542-4204/+3660
* | | Merge pull request #18554 from owncloud/fix-gs-share-masterMorris Jobke2015-08-252-2/+13
|\ \ \
| * | | don't load gs-shareThomas Müller2015-08-251-2/+4
| * | | Simply hide sharing buttons for IE8 - fixes #18011Thomas Müller2015-08-252-0/+9
* | | | Merge pull request #18558 from owncloud/ext-objectstoreLukas Reschke2015-08-252-2/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Prevent objectstore being set from client sideRobin McCorkell2015-08-252-2/+16
* | | | Merge pull request #18550 from owncloud/mobile-shared-styleJan-Christoph Borchardt2015-08-251-6/+6
|\ \ \ \
| * | | | fix being able to distinguish shared items on mobileJan-Christoph Borchardt2015-08-251-6/+6
| |/ / /
* | | | Merge pull request #18543 from owncloud/remove-linesJan-Christoph Borchardt2015-08-251-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | reduce files table header lineJan-Christoph Borchardt2015-08-251-2/+6
| |/ /
* | | Merge pull request #18538 from owncloud/sidebar-improvementsVincent Petry2015-08-257-6/+54
|\ \ \ | |/ / |/| |
| * | Fix row highlight in other file listsVincent Petry2015-08-251-0/+1
| * | Fix trashbin sidebarVincent Petry2015-08-254-4/+47
| * | Properly hide sidebar when switching between files app sectionsVincent Petry2015-08-252-2/+6
* | | Merge pull request #18440 from owncloud/ext-backends.customjsMorris Jobke2015-08-2516-308/+529
|\ \ \ | |/ / |/| |
| * | Migrate Google external storage to new APIRobin McCorkell2015-08-258-147/+201
| * | Migrate Dropbox external storage to new APIRobin McCorkell2015-08-258-130/+189
| * | Migrate AmazonS3 external storage to new APIRobin McCorkell2015-08-254-27/+109
| * | Add on-backend and on-auth-mechanism events to JSRobin McCorkell2015-08-251-4/+30
* | | Merge pull request #18523 from owncloud/crazy-scannerThomas Müller2015-08-252-4/+11
|\ \ \
| * | | Prevent scanner going crazy with unavailable storagesVincent Petry2015-08-242-4/+11
* | | | Merge pull request #18445 from owncloud/ext-only-setuservars-stringMorris Jobke2015-08-2511-22/+83
|\ \ \ \ | |_|/ / |/| | |
| * | | Convert string booleans to real booleansRobin McCorkell2015-08-207-17/+76
| * | | setUserVars() should only attempt substitution with stringsRobin McCorkell2015-08-204-5/+7
* | | | Merge pull request #18528 from owncloud/files-sidebar-mtimeMorris Jobke2015-08-242-0/+30
|\ \ \ \
| * | | | Parse mtime from the data attributesVincent Petry2015-08-242-0/+30
| | |/ / | |/| |
* | | | Merge pull request #18525 from owncloud/app-sidebar-styleMorris Jobke2015-08-242-6/+7
|\ \ \ \
| * | | | bigger file thumbnail in app sidebarJan-Christoph Borchardt2015-08-242-6/+7
| |/ / /
* / / / Remove DEBUG constant and use config valueMorris Jobke2015-08-242-1/+10
|/ / /
* | | Merge pull request #18244 from owncloud/fix-issue-17677blizzz2015-08-246-20/+12
|\ \ \
| * | | Spaces -> tabsLennart Rosam2015-08-221-6/+6
| * | | Remove if-block as the helper does return the empty prefixLennart Rosam2015-08-211-5/+0
| * | | Add database update routine and bump version to 0.6.2Lennart Rosam2015-08-192-1/+16
| * | | Remove another occurance of ldap_nocaseLennart Rosam2015-08-191-14/+0
| * | | Fix 17677Lennart Rosam2015-08-123-5/+1
* | | | Merge pull request #18477 from owncloud/fed-alwaysdetectremotechangesVincent Petry2015-08-241-0/+2
|\ \ \ \
| * | | | Always detect remote changes for fed sharingVincent Petry2015-08-211-0/+2
* | | | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryptionLukas Reschke2015-08-2411-37/+343
|\ \ \ \ \
| * | | | | use uid as additional information for saltBjoern Schiessle2015-08-075-17/+17
| * | | | | use password hash instead of the plain password to encrypt the private keyBjoern Schiessle2015-08-0711-29/+335
* | | | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxyVincent Petry2015-08-245-53/+247
|\ \ \ \ \ \
| * | | | | | Use IClientService to check for remote ownCloud instancesLukas Reschke2015-08-225-53/+247
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18505 from owncloud/fix-personal-scrollbarMorris Jobke2015-08-241-0/+1
|\ \ \ \ \ \