aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3952 from nextcloud/downstream-27209Morris Jobke2017-03-201-0/+26
|\
| * Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-201-0/+26
* | Merge pull request #3947 from nextcloud/downstream-27323Morris Jobke2017-03-201-0/+5
|\ \
| * | Disable empty password for user::resetpassword command using CLISujith H2017-03-201-0/+5
| |/
* | Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDsMorris Jobke2017-03-202-3/+3
|\ \
| * | Fix duplicate id "apps-management"Michael Letzgus2017-03-191-1/+1
| * | Fix duplicate id "apps-management"Michael Letzgus2017-03-191-2/+2
* | | Merge pull request #3934 from nextcloud/downstream-27246Morris Jobke2017-03-201-4/+4
|\ \ \
| * | | ownC -> NextcMorris Jobke2017-03-191-1/+1
| * | | Update the occ:encrypt-all promptMatthew Setter2017-03-191-4/+4
| | |/ | |/|
* | | Merge pull request #3936 from nextcloud/downstream-27253Christoph Wurst2017-03-201-0/+2
|\ \ \
| * | | Add extensionpoint to sharedialogviewFelix Heidecke2017-03-191-0/+2
| |/ /
* | | Merge pull request #3942 from nextcloud/downstream-27264Morris Jobke2017-03-201-0/+4
|\ \ \
| * | | Clear onpopstate handlers after unit testsVincent Petry2017-03-191-0/+4
| |/ /
* | | Merge pull request #3919 from michaelletzgus/layout-fix_avatarChristoph Wurst2017-03-201-4/+0
|\ \ \ | |/ / |/| |
| * | Fix avatar and caret positionMichael Letzgus2017-03-191-4/+0
| |/
* | Use SystemConfig instead of AllConfig for DB stuffMorris Jobke2017-03-193-9/+9
* | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-193-2/+23
|\ \ | |/ |/|
| * shares-circlesMaxence Lange2017-03-173-2/+23
* | [tx-robot] updated from transifexNextcloud bot2017-03-1816-90/+194
|/
* Merge pull request #3881 from nextcloud/downstream-26842Joas Schilling2017-03-171-5/+41
|\
| * Backbone Webdav Adapter MKCOL supportVincent Petry2017-03-171-5/+41
* | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-executionRoeland Jago Douma2017-03-171-0/+9
|\ \
| * | Harden JS by disabling jQuery evalLukas Reschke2017-03-161-0/+9
* | | [tx-robot] updated from transifexNextcloud bot2017-03-1764-630/+76
| |/ |/|
* | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-163-10/+173
|\ \ | |/ |/|
| * Fix layout of sharing buttonsMorris Jobke2017-03-141-13/+18
| * Fix testsRoeland Jago Douma2017-03-061-0/+1
| * Make sure copy tooltip remains when we have no social providersRoeland Jago Douma2017-03-031-5/+22
| * Move social buttons to menuRoeland Jago Douma2017-03-033-149/+96
| * Add social sharingRoeland Jago Douma2017-03-033-1/+194
* | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-163-53/+286
|\ \
| * | Fix html formating issuesJulius Haertl2017-03-161-14/+5
| * | Rebuild menu to keep order of icons correctJulius Haertl2017-03-161-1/+3
| * | Reduce device width and hide app name when menu is openJulius Haertl2017-03-161-2/+3
| * | Make enabling/disabling apps work with the new menuJulius Haertl2017-03-162-11/+10
| * | Fix positioning of popovermenuJulius Haertl2017-03-161-2/+6
| * | Fix popover positioning after window resizeJulius Haertl2017-03-161-5/+13
| * | Cleanup SCSS for app menu and fix mobile viewJulius Haertl2017-03-161-103/+91
| * | Make app management icon act like a normal app iconJulius Haertl2017-03-161-2/+3
| * | Fix menu issuesJulius Haertl2017-03-163-55/+82
| * | Generate seperate menu list for header barJulius Haertl2017-03-162-19/+30
| * | Show app icons in the headerJulius Haertl2017-03-163-5/+206
* | | Harden t() with DOMPurifyLukas Reschke2017-03-164-17/+23
* | | Fix unit tests of masterRoeland Jago Douma2017-03-161-0/+38
* | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-1/+12
|\ \ \ | |/ / |/| |
| * | Add warning on admin screen when set_time_limit is unavailableKo-2017-03-161-0/+8
| * | Check that set_time_limit is not disabled before calling itKo-2017-03-111-1/+4
* | | Merge pull request #3624 from marncz/masterRoeland Jago Douma2017-03-161-2/+15
|\ \ \
| * | | SpacingMarcin Czarnecki2017-03-151-1/+1