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

16650 commits

Author SHA1 Message Date
Morris Jobke
2372e2d849 Merge pull request #6453 from nextcloud/fix-5273 
Fix initializing paged search under some circumstances
 2017-09-15 17:03:19 +02:00
Morris Jobke
4eb2ce5b32 Merge pull request #6506 from nextcloud/sharename-overlap 
Fix sharer name overlap with filename
 2017-09-15 16:49:37 +02:00
Bjoern Schiessle
6e69881512
allow apps to control the trash bin 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-15 11:32:45 +02:00
Nextcloud bot
113fd47f30
[tx-robot] updated from transifex 2017-09-15 00:08:08 +00:00
Jan-Christoph Borchardt
42ac9cde08 Correctly ellipsize file names, fix #6498 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-14 16:43:24 +02:00
Jan-Christoph Borchardt
06691611e3 Ellipsize sharer name, ref #6498 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-14 16:38:31 +02:00
Arthur Schiwon
0b625069e8
adapted integration tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
5e74affea4
fix counting found results in search op 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
fc097a80f5
improve and extend paging integration test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
34f9590169
replace hard-coded attribute with the corresponding settings option 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
89f4e16cdb
fix limit-flaw in search on paged results 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Morris Jobke
2d4026357f
Allow to close sidebar for text files 
* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-14 11:30:54 +02:00
Nextcloud bot
7698781a1e
[tx-robot] updated from transifex 2017-09-14 00:08:12 +00:00
Morris Jobke
c5dbe1c772 Merge pull request #6483 from nextcloud/fix_quota_new_endpoint 
Fix quota calculation on new dav upload endpoint
 2017-09-14 00:37:55 +02:00
Morris Jobke
ba2e1c5db9 Merge pull request #5689 from nextcloud/fix-4117 
LDAP: simplify returning the homePath and fixing #4117
 2017-09-14 00:23:01 +02:00
Roeland Jago Douma
ab63c89ab3
Fix quota calculation on new dav upload endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-13 19:28:38 +02:00
Morris Jobke
d659199ff5 Merge pull request #5398 from nextcloud/theming-page-title 
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
 2017-09-13 13:08:37 +02:00
Joachim Bauch
91598cbfb5
Use theme methods "getTitle" and "getEntity" as fallback if name is not themed. 
This fixes an issue with custom filesystem themes that can define title, name
and entity differently, but the theming app was only using the name as fallback
(see #5374).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
 2017-09-13 11:02:45 +02:00
Morris Jobke
241579587a Merge pull request #6457 from nextcloud/theming-favicon-invert-apps 
Invert themed favicons on bright colors
 2017-09-13 10:48:33 +02:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Morris Jobke
83508d7be3 Merge pull request #6451 from nextcloud/theming-manifest-json 
Theming app support for chrome manifest.json file
 2017-09-12 15:10:08 +02:00
Julius Härtl
9a47b25f19
Theming: Invert app icon in favicon for bright backgrounds 
fixes #5650

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 11:37:25 +02:00
Julius Härtl
1f8a3e05c1
Theming: Use png32 for generated icons 
fixes #4796

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 11:34:21 +02:00
Julius Härtl
81ef116bfb
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:28:22 +02:00
Julius Härtl
770aae42f6
Add themed manifest.json to theming app 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:23:12 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:22:57 +02:00
John Molakvoæ
ff27308b88 Merge pull request #6448 from weizenspreu/master 
print generated encryption key passwords directly after generating th…
 2017-09-12 05:16:30 +02:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex 2017-09-12 00:08:25 +00:00
Kenneth Newwood
7092c50e7c print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss 
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
 2017-09-11 12:52:25 +02:00
Joas Schilling
f5617d78eb Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comment-activity-in-email 
Allow translations of the comments activity in the emails too
 2017-09-11 10:52:45 +02:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex 2017-09-10 00:08:23 +00:00
Nextcloud bot
194f880073
[tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Nextcloud bot
9959560649
[tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Morris Jobke
8e6d86a862 Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events 
don't send invitation emails for past events
 2017-09-06 22:48:46 +02:00
Robin Appelman
ccc41aeddd
adjust tests to new failed storage handling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-06 17:12:19 +02:00
Morris Jobke
6f7d200838 Merge pull request #6370 from nextcloud/fix-alternative-logins 
Fix layout of alternative login buttons
 2017-09-06 10:22:04 +02:00
Morris Jobke
f5aea79bd7
Fix layout of alternative login buttons 
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 10:21:11 +02:00
Morris Jobke
1724fed8c5 Merge pull request #5415 from nextcloud/search-cache-node 
cache nodes from search results
 2017-09-06 10:16:01 +02:00
Nextcloud bot
9d930210ee
[tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Joas Schilling
521ede8f5f
Allow translations of the comments activity in the emails too 
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-05 18:10:32 +02:00
Morris Jobke
15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name 
Set the meta data before everything
 2017-09-05 16:08:57 +02:00
Morris Jobke
cebbb1633a Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard 
recognize groupOfUniqueNames as valid LDAP group object
 2017-09-05 13:33:15 +02:00
Georg Ehrke
a1df91da9d
Sabre/VObject returns DateTimeImmutable, not a simple DateTime 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Georg Ehrke
86f28669fc
don't send invitation emails for past events 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Morris Jobke
ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes 
LDAP Connectivity Fixes
 2017-09-04 18:31:32 +02:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Julius Härtl
63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl
da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00