summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #1194 from nextcloud/card-caldav-check-existsJoas Schilling2016-09-016-16/+49
|\
| * more efficient check if addressbook and calendar exists for userRobin Appelman2016-08-316-16/+49
* | Merge pull request #1215 from nextcloud/issue-1083-update-live-relative-times...Roeland Jago Douma2016-09-014-4/+8
|\ \
| * | Use live timestamp on comments tabJoas Schilling2016-09-011-1/+2
| * | Use live timestamps in the versions tab of the sidebarJoas Schilling2016-09-011-1/+2
| * | Use live timestamp in the sidebar detailsJoas Schilling2016-09-011-1/+2
| * | Update live timestamps to give a more live feelingJoas Schilling2016-09-011-1/+2
* | | Merge pull request #1224 from nextcloud/do-not-allow-linebreak-in-pathsRoeland Jago Douma2016-09-012-2/+10
|\ \ \
| * | | Also prevent null byte characterJoas Schilling2016-09-012-1/+3
| * | | Filter out %0A from pathsJoas Schilling2016-09-012-2/+8
| |/ /
* | | Merge pull request #1143 from nextcloud/ldap-smells-for-fun-and-profitJoas Schilling2016-09-0112-24/+12
|\ \ \
| * | | Fix phpdocRoeland Jago Douma2016-08-291-1/+1
| * | | fix a few minor code smellsJörn Friedrich Dreyer2016-08-2912-23/+11
* | | | Merge pull request #1217 from nextcloud/federation_phpunit_fixesJoas Schilling2016-09-016-29/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix deprecated getMock call in Federation appRoeland Jago Douma2016-08-316-29/+33
* | | | [tx-robot] updated from transifexNextcloud bot2016-09-01166-466/+892
* | | | Fix ThemingDefaults getMock deprecationRoeland Jago Douma2016-08-311-5/+5
|/ / /
* | | Merge pull request #1212 from nextcloud/fix_federatedfilesharingtestsRoeland Jago Douma2016-08-315-27/+35
|\ \ \
| * | | Fix deprecated usages of getMock in federatedfilesharingRoeland Jago Douma2016-08-315-27/+35
| | |/ | |/|
* | | Merge pull request #1201 from nextcloud/usermountcache-orphanedshareRoeland Jago Douma2016-08-311-1/+7
|\ \ \ | |/ / |/| |
| * | Added closeCursor in SharedMount numeric idVincent Petry2016-08-301-0/+1
| * | Prevent error with orphaned shares when updating user mount cacheVincent Petry2016-08-301-1/+6
* | | Merge pull request #1137 from nextcloud/external_storage_lnkLukas Reschke2016-08-311-1/+1
|\ \ \
| * | | add in files view a link to personal files externaldavitol2016-08-291-1/+0
| * | | add link to personal files externaldavitol2016-08-291-0/+1
| | |/ | |/|
* | | Merge pull request #1189 from nextcloud/share-allowspaceinremoteLukas Reschke2016-08-302-1/+53
|\ \ \ | |_|/ |/| |
| * | Allow space for federated share id searchVincent Petry2016-08-302-1/+53
* | | Merge pull request #1190 from nextcloud/addressbook-correctly-handle-multi-va...Morris Jobke2016-08-302-2/+105
|\ \ \
| * | | Add a unit test for all the magicJoas Schilling2016-08-301-1/+64
| * | | Correctly handle multi-values when converting VCards to arrayJoas Schilling2016-08-301-1/+41
* | | | Merge pull request #1138 from nextcloud/expiry-as-occ-commandRoeland Jago Douma2016-08-304-0/+263
|\ \ \ \ | |_|/ / |/| | |
| * | | Add occ command to expire the trashbin (#25878)Thomas Müller2016-08-294-0/+263
| | |/ | |/|
* | | Merge pull request #1178 from nextcloud/theming-spinner-animationJoas Schilling2016-08-302-8/+19
|\ \ \ | |_|/ |/| |
| * | Theming: Show loading spinner while uploading filesJulius Haertl2016-08-302-8/+19
* | | Merge pull request #988 from nextcloud/ocs_federationMorris Jobke2016-08-303-64/+82
|\ \ \
| * | | Use function parametersRoeland Jago Douma2016-08-282-17/+8
| * | | Move OCSAuthAPI to AppFrameworkRoeland Jago Douma2016-08-283-49/+76
* | | | 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
|\ \ \ \