mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33,945 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

33945 Commits

Author SHA1 Message Date
Marius Blüm c41bd47c0d Merge pull request #973 from nextcloud/stable10-959 
[stable10] Update mimetypes
 2016-08-19 13:13:50 +02:00
Roeland Jago Douma 1f473c11a1 Merge pull request #966 from nextcloud/stable9-1-link-share 
[stable10] In cases where the server dictates the link share expirat…
 2016-08-19 12:39:17 +02:00
Lukas Reschke 289964a477 Merge pull request #961 from nextcloud/fix-caldavtester-stable10 
[stable10] Move over to new CalDAVTester repo (#25859)
 2016-08-19 12:16:33 +02:00
Roeland Jago Douma 2ab26f3667 Update mimetypes 2016-08-19 11:35:52 +02:00
Julius Haertl fe15940233
Fix loading of ThemingDefaults 2016-08-19 11:29:58 +02:00
Thomas Müller 24f35f9076
[stable9.1] In cases where the server dictates the link share expiration the date is not updated on consequitive changes and enable/disable actions 2016-08-19 10:28:22 +02:00
Thomas Müller 0298760c1b
Move over to new CalDAVTester repo (#25859) 
* Move over to new caldac tester repo

* no run.py anymore
 2016-08-19 10:19:58 +02:00
Marius Blüm 7f486705e0 Merge pull request #957 from nextcloud/stable10_fix_948 
[Stable10] Nextcloud is being updated. Not ownCloud
 2016-08-19 09:39:09 +02:00
Roeland Jago Douma a2b6d4d923
Nextcloud is being updated. Not ownCloud 
Fixes #948
 2016-08-19 08:36:17 +02:00
Robin Appelman e286e0492a fix error when not logged in 2016-08-18 23:37:34 +02:00
Robin Appelman bead6c9307 change remote cloud naming to Nextcloud 2016-08-18 23:37:16 +02:00
Robin Appelman 42f14ab5a9 dont register personal files_external setting if it's empty 2016-08-18 23:37:04 +02:00
Roeland Jago Douma df5a1e2a30 Merge pull request #939 from nextcloud/stable10-backport-937 
[stable10] SVG defintions always take the first one
 2016-08-18 19:21:28 +02:00
Morris Jobke 0f926e03bd Merge pull request #926 from nextcloud/backport-925-use-util-methods 
[stable10] Load the Template class in case it's not loaded
 2016-08-18 16:38:55 +02:00
Roeland Jago Douma c07090ef6e
SVG defintions always take the first one 
* Move filter definition out
 2016-08-18 16:29:05 +02:00
Morris Jobke f68d5d1071 Merge pull request #935 from nextcloud/stable10-add-cachebusters 
[Stable10] add cachebusters
 2016-08-18 15:49:44 +02:00
Roeland Jago Douma 99a39ad209 Merge pull request #932 from nextcloud/backport-930-check-isset-require 
[stable10] Fix "Undefined index" when the values do not exist
 2016-08-18 14:16:31 +02:00
Lukas Reschke e014ec548d
Add cachebuster to apps.css 2016-08-18 12:46:07 +02:00
Lukas Reschke d8aba95322
Add cachebuster to apps.css 2016-08-18 12:46:03 +02:00
Lukas Reschke d639fee237
Add cachebuster to styles.css 2016-08-18 12:45:59 +02:00
Lukas Reschke d6c31b4107
Add cachebuster to right navigation 2016-08-18 12:45:56 +02:00
Lukas Reschke 95fca9abad
Add cache buster to left menu bar 2016-08-18 12:45:52 +02:00
Lukas Reschke 9ef16cea89
Add cache buster to logo 2016-08-18 12:45:49 +02:00
Lukas Reschke 3ac524c420 Merge pull request #904 from nextcloud/backport-903-allow-disable-comments 
[stable10] Revert "Always add activities for comments to the stream"
 2016-08-18 12:06:11 +02:00
Joas Schilling 91fbf815f9
Fix "Undefined index" when the values do not exist 2016-08-18 12:03:10 +02:00
Joas Schilling 93a3b7bb18
Load the Template class in case it's not loaded 2016-08-18 12:01:59 +02:00
Roeland Jago Douma 5b6b9ad1ff Merge pull request #921 from nextcloud/backport-867-notification-primary-action-always-first 
[stable10] Make sure the primary action is always the first one
 2016-08-18 10:39:27 +02:00
Joas Schilling 1927c28b9f Merge pull request #910 from nextcloud/stable10_864 
[Stable10] Ensure the user exists before calling a method on it
 2016-08-18 09:30:47 +02:00
Joas Schilling e1ec3964c8
Make sure the primary action is always the first one 2016-08-18 09:27:14 +02:00
Lukas Reschke 34ee64c853 Merge pull request #915 from nextcloud/stable10-backport-914 
add viewBox to app icon for proper scaling in Firefox
 2016-08-17 19:45:19 +02:00
Vincent Petry 11e9ce669a
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 19:39:08 +02:00
Vincent Petry c1ad88a777
Fix unmerged shares repair with mixed group and direct shares 
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
 2016-08-17 19:38:33 +02:00
Vincent Petry 837dc0b336
Improve file_target finding logic when repairing unmerged shares 
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
 2016-08-17 19:38:19 +02:00
Morris Jobke 6d43860457
add viewBox to app icon for proper scaling in Firefox 2016-08-17 18:39:50 +02:00
Marius Blüm 76f19c0775 Merge pull request #913 from nextcloud/increase-version-to-rc1 
[stable10] Increase version to 10.0 RC1
 2016-08-17 18:07:14 +02:00
Lukas Reschke 398596b3eb Merge pull request #912 from nextcloud/stable10-backport-905 
Stable10 backport 905
 2016-08-17 17:54:07 +02:00
Lukas Reschke 18bfa83d20
Increase version to 10.0 RC1 
Let's get ready for that ;-)
 2016-08-17 17:02:41 +02:00
Morris Jobke b3cc9c6998
Fix null reference in IE 2016-08-17 16:27:18 +02:00
Morris Jobke 6f48494b08
Empty tags are not allowed for image and feColorMatrix in IE11 and below 2016-08-17 16:27:12 +02:00
Roeland Jago Douma a3c5aefc96
Add viewBox to app icons 
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
 2016-08-17 16:27:04 +02:00
Roeland Jago Douma ed950eb861
Remove hack 2016-08-17 16:24:31 +02:00
Morris Jobke b8d4baacdc
Introduce weird hack for Firefox 
* everything is 4 times as big (doubled width and doubled height)
 2016-08-17 16:24:27 +02:00
Roeland Jago Douma 57c09bbba4
Filter can't be named invert in FF 2016-08-17 16:24:20 +02:00
Lukas Reschke f3336e93b8 Merge pull request #907 from nextcloud/nfd-default-10 
[uc][10] Disable NFD encoding wrapper by default
 2016-08-17 16:24:12 +02:00
Jörn Friedrich Dreyer 29565ec423
use $userId instead of $user 2016-08-17 15:51:36 +02:00
Thomas Müller 63fc5b601d
Ensure the user exists before calling a method on it - fixes #24751 2016-08-17 15:51:19 +02:00
Morris Jobke 582250e55c Merge pull request #909 from nextcloud/stable10-backport-l10n 
[stable10][tx-robot] updated from transifex
 2016-08-17 15:44:22 +02:00
Nextcloud bot 4470ab36bb
[tx-robot] updated from transifex 2016-08-17 13:32:21 +00:00
Vincent Petry 3c2de97ab1 Disable NFD encoding wrapper by default 
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
 2016-08-17 14:45:18 +02:00
Joas Schilling f900861485
Revert "Always add activities for comments to the stream" 
This reverts commit 48c41b888c
 2016-08-17 13:33:53 +02:00