wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33367 commits 157 branches 562 tags 714 MiB
Commit graph

33367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Douma
26cf51403e Merge pull request #464 from nextcloud/master-change-load-order 
[master] Change load order of auth backends so that we can throw an exception …
 2016-07-20 20:08:22 +02:00
Roeland Douma
ffc345b141 Merge pull request #468 from nextcloud/stringid-fix 
Cast share id to string (#25402)
 2016-07-20 20:06:46 +02:00
Morris Jobke
032e6b1701 Merge pull request #473 from nextcloud/ux-improvement-share-dialog 
only show additional edit permissions for folders
 2016-07-20 18:34:55 +02:00
Morris Jobke
e9c85e02ac Merge pull request #462 from nextcloud/master-explode 
[master] Use explode() instead of split()
 2016-07-20 18:31:11 +02:00
Morris Jobke
e2abe70514 Merge pull request #470 from nextcloud/sftp-renameoverwritedir 
Fix overwriting folders on rename with SFTP
 2016-07-20 18:31:06 +02:00
Björn Schießle
7cdf6402ff Merge pull request #472 from nextcloud/show-app-name-in-errormsg 
Show app name in error message if app could not be loaded. (#25441)
 2016-07-20 18:20:49 +02:00
Morris Jobke
1264e9644f Merge pull request #402 from nextcloud/smb-notifications 
smb update notifications
 2016-07-20 16:19:21 +02:00
Bjoern Schiessle
77d2338bd2
only show additional edit permissions for folders 2016-07-20 15:24:51 +02:00
Klaas Freitag
99316ec02c
Show app name in error message if app could not be loaded. (#25441) 2016-07-20 15:16:16 +02:00
Vincent Petry
d372836efc
Fix overwriting folders on rename with SFTP 
This aligns the behavior with other storages and also fixes the failing
unit test testRenameOverWriteDirectory
 2016-07-20 15:12:27 +02:00
Vincent Petry
e5c4f53eea
Cast share id to string (#25402) 2016-07-20 15:10:10 +02:00
Thomas Müller
e795f7b106
Change load order of auth backends so that we can throw an exception in OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25476) 2016-07-20 14:40:52 +02:00
Lukas Reschke
4f90447150
[master] Use explode() instead of split() 
Sync from https://github.com/owncloud/core/pull/25488
 2016-07-20 14:36:39 +02:00
Lukas Reschke
b37e1ed17f Merge pull request #460 from nextcloud/issue-459-html-decoded-error-message-when-uploading-folder 
Fix the HTML encoding when uploading a folder in FF when using french…
 2016-07-20 14:31:41 +02:00
Joas Schilling
45c99c226b
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-20 13:03:27 +02:00
Joas Schilling
f414c664f2 Merge pull request #458 from nextcloud/remove-ee-apps-from-shipped.json 
Remove pre-fork EE apps from shipped.json
 2016-07-20 12:18:40 +02:00
Joas Schilling
5632cb9a3b
Remove pre-fork EE apps from shipped.json 2016-07-20 11:19:55 +02:00
Nextcloud bot
78e0bdc003
[tx-robot] updated from transifex 2016-07-20 00:09:13 +00:00
Roeland Douma
76fd95bddb Merge pull request #448 from nextcloud/master-guzzle 
[master] Update third-party reference
 2016-07-19 21:45:52 +02:00
Morris Jobke
21b05b646f Merge pull request #452 from nextcloud/session-passwords-design 
Adjust wording and layout of Sessions and App passwords personal settings
 2016-07-19 20:57:54 +02:00
Lukas Reschke
189eb3e7ff
[master] Update third-party reference 
For https://github.com/nextcloud/3rdparty/pull/7
 2016-07-19 20:48:16 +02:00
Lukas Reschke
56496f98ab Merge pull request #451 from nextcloud/github-link 
fix Github link in Personal and Admin settings Version note
 2016-07-19 20:46:23 +02:00
Morris Jobke
a3ea826b82 Merge pull request #446 from nextcloud/cron-radio-buttons-color 
Use the themed radio buttons for cron selection
 2016-07-19 17:54:16 +02:00
Björn Schießle
8735a05d93 Merge pull request #441 from nextcloud/fix-maintenance-mode 
Fix maintenance mode
 2016-07-19 16:59:24 +02:00
Joas Schilling
10fa8a05a0
Use the themed radio buttons for cron selection 2016-07-19 16:41:47 +02:00
Morris Jobke
47c80ae1cf Merge pull request #438 from nextcloud/sessions-list-format 
format current and sync client sessions in Personal
 2016-07-19 13:50:32 +02:00
Roeland Douma
13a25535d2 Merge pull request #400 from nextcloud/ocs_appframework 
OCS routes use AppFramework
 2016-07-19 12:21:14 +02:00
Jan-Christoph Borchardt
9b22be2023 set max width for sessions tables so it doesn’t go crazy on large screens 2016-07-19 11:42:57 +02:00
Jan-Christoph Borchardt
762cc2a773 adjust layout of Sessions and App passwords sections 2016-07-19 11:37:46 +02:00
Jan-Christoph Borchardt
f1c0c90ac9 simplify wording of Sessions and App passwords sections 2016-07-19 11:37:20 +02:00
Morris Jobke
544c3c1565 Merge pull request #436 from nextcloud/public-regex-to-match-our-clients 
Copy the regexes to the public interface
 2016-07-19 11:35:10 +02:00
Robin Appelman
df2dffaf7c add fancy formating for most browsers 2016-07-19 11:27:58 +02:00
Jan-Christoph Borchardt
6797b2b90f fix Github link in Personal and Admin settings Version note 2016-07-19 11:15:46 +02:00
Morris Jobke
0a6d95b126 Merge pull request #394 from nextcloud/tags-for-everything 
SystemTags for everything not just files
 2016-07-19 10:47:12 +02:00
Joas Schilling
80168613be
Fix maintenance mode 
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
 2016-07-19 09:54:42 +02:00
Nextcloud bot
4a963c21ff
[tx-robot] updated from transifex 2016-07-19 00:09:00 +00:00
Roeland Douma
35f48d6f35 Merge pull request #435 from nextcloud/classmap 
Use classmap to load core files
 2016-07-18 22:12:03 +02:00
Robin Appelman
fac970b065 format current and sync client sessions in Personal 2016-07-18 19:39:03 +02:00
Björn Schießle
f7d26e4aa5 Merge pull request #414 from nextcloud/files_sharing_event_dispatcher 
Files sharing event dispatcher
 2016-07-18 16:10:21 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Björn Schießle
ea470f8777 Merge pull request #405 from nextcloud/theming-fixes 
Theming fixes
 2016-07-18 15:59:47 +02:00
Morris Jobke
68735c188c Merge pull request #430 from nextcloud/remove_assetic 
[3rdparty] Remove assetic
 2016-07-18 15:55:48 +02:00
Morris Jobke
b1a9f12b77 Merge pull request #428 from nextcloud/setupfromtoken_sharemanager 
Move SetupFromToken to ShareManager
 2016-07-18 15:49:51 +02:00
Joas Schilling
b1d652e8b0
Copy the regexes to the public interface 2016-07-18 15:11:44 +02:00
Roeland Jago Douma
14be81c5b0
Use classmap to load core files 
We can't use an authoritive classmap in the current state as it would
kill app loading. However we can use a proper classmap for the normal
core stuff.
 2016-07-18 14:46:54 +02:00
Roeland Jago Douma
773250be24
Cleanup coding style 2016-07-18 13:35:35 +02:00
Roeland Jago Douma
1c5e082ee1
Add eventdispatcher to public link view 2016-07-18 13:35:35 +02:00
Roeland Jago Douma
ea3035aa0e
Move JS inclusion to Controller 
* This way we can easier load files conditionally
 2016-07-18 13:34:32 +02:00
Roeland Jago Douma
ca57f755fd
[3rdparty] Remove assetic 2016-07-18 13:10:42 +02:00
Roeland Douma
3e00edff99 Merge pull request #431 from nextcloud/postgres-password-not-quoted 
Prevent syntax error when creating user or changing password
 2016-07-18 13:04:10 +02:00