summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #974 from nextcloud/move_ocs_routes_to_fedfilesharingMorris Jobke2016-08-304-92/+162
|\
| * Move federated sharing routes to the federatedfilesharingappRoeland Jago Douma2016-08-284-92/+162
* | Merge pull request #1132 from nextcloud/prevent-parse-error-on-editing-an-htm...blizzz2016-08-301-1/+1
|\ \
| * | Prevent parse error on editing an HTML commentJoas Schilling2016-08-291-1/+1
| |/
* | Merge pull request #1170 from nextcloud/theming-fix-primary-buttonLukas Reschke2016-08-292-35/+77
|\ \
| * | Theming: fix primary button for bright colorsJulius Haertl2016-08-292-35/+77
* | | Merge pull request #1130 from nextcloud/shared-upload-quotaRoeland Jago Douma2016-08-291-0/+10
|\ \ \
| * | | A shared storage is never a home storage - fixes #25582Thomas Müller2016-08-291-0/+10
| | |/ | |/|
* | | Merge pull request #1147 from nextcloud/files-hidden-files-summaryRoeland Jago Douma2016-08-294-52/+230
|\ \ \
| * | | Display number of hidden files in files summary (#25870)Vincent Petry2016-08-294-52/+230
| |/ /
* | | Merge pull request #1146 from nextcloud/init-filesconfigRoeland Jago Douma2016-08-291-0/+4
|\ \ \
| * | | Make sure file list files config always existsVincent Petry2016-08-291-0/+4
| |/ /
* | | Merge pull request #1148 from nextcloud/files-scan-reconnect-database-before-...Roeland Jago Douma2016-08-291-1/+26
|\ \ \
| * | | Before a user is getting scanned the database connection is re-establishedThomas Müller2016-08-291-1/+26
| |/ /
* | | Merge pull request #1145 from nextcloud/upstream-25794Roeland Jago Douma2016-08-292-9/+6
|\ \ \ | |_|/ |/| |
| * | [master] DAV: Return data-fingerprint always when asked (#25482)Markus Goetz2016-08-292-9/+6
| |/
* | Merge pull request #1117 from iamfool/masterLukas Reschke2016-08-292-4/+4
|\ \ | |/ |/|
| * Update AdminTest.phpiamfool2016-08-291-3/+3
| * Update Admin.phpiamfool2016-08-281-1/+1
* | Merge pull request #976 from nextcloud/downstream-25702Lukas Reschke2016-08-284-8/+19
|\ \ | |/ |/|
| * Hide the LDAP password in the client sideJuan Pablo Villafáñez2016-08-194-8/+19
* | Merge pull request #1103 from nextcloud/improve-theming-performanceJan-Christoph Borchardt2016-08-273-10/+107
|\ \
| * | Use temporary file as cacheLukas Reschke2016-08-272-4/+16
| * | Increase theming performanceLukas Reschke2016-08-273-7/+92
* | | Merge pull request #1054 from nextcloud/less-cache-hitsLukas Reschke2016-08-271-1/+6
|\ \ \ | |/ / |/| |
| * | reuse the userfolder's fileinfo when possible during dav setupRobin Appelman2016-08-251-1/+6
* | | Theming: Preview for page titleJulius Haertl2016-08-261-0/+3
* | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loopJoas Schilling2016-08-262-2/+3
|\ \ \
| * | | prevent infinite redirect loops if the there is no 2fa provider to passChristoph Wurst2016-08-242-2/+3
| |/ /
* | | Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntaxRoeland Jago Douma2016-08-264-354/+9
|\ \ \
| * | | Reorder the buttons by importanceJoas Schilling2016-08-264-353/+8
| * | | FIx the syntax of the buttonsJoas Schilling2016-08-261-1/+1
* | | | Merge pull request #771 from nextcloud/theming-fixesRoeland Jago Douma2016-08-264-16/+146
|\ \ \ \
| * | | | Make federadedfilesharing button match the theming valuesJulius Haertl2016-08-262-13/+23
| * | | | Theming: Adjust jquery ui elementsJulius Haertl2016-08-262-2/+46
| * | | | Theming: colorize primary buttonsJulius Haertl2016-08-262-2/+75
| * | | | Theming: fix federated sharing button colorJulius Haertl2016-08-262-1/+4
* | | | | Merge pull request #1077 from nextcloud/sharee_ocs_appframeworkLukas Reschke2016-08-263-93/+79
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Sharee API to AppFrameworkRoeland Jago Douma2016-08-263-93/+79
* | | | | Theming: Hide undo button on default valuesJulius Haertl2016-08-262-2/+32
* | | | | Theming: Add preview for login screenJulius Haertl2016-08-265-5/+46
| |/ / / |/| | |
* | | | Merge pull request #1026 from nextcloud/theming-extend-defaultsRoeland Jago Douma2016-08-262-7/+84
|\ \ \ \ | |/ / / |/| | |
| * | | Use the lazy root to make tests pass 🙈Joas Schilling2016-08-242-5/+1
| * | | Theming: Add logo and background to ThemingDefaultsJulius Haertl2016-08-242-3/+84
* | | | Fix testsRoeland Jago Douma2016-08-241-13/+44
* | | | HTTPHelper is deprecatedRoeland Jago Douma2016-08-247-19/+33
* | | | Merge pull request #1033 from nextcloud/fix_theming_autoloader_magicRoeland Jago Douma2016-08-241-3/+2
|\ \ \ \
| * | | | Require a ThemingDefaults class againRoeland Jago Douma2016-08-241-3/+2
* | | | | Merge pull request #936 from nextcloud/better-dav-display-namesLukas Reschke2016-08-2410-29/+83
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Better displaynames for shared address booksJoas Schilling2016-08-245-11/+44