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

18572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
70ae7fa091 Fix casing and PHPDoc 2014-06-03 19:10:18 +02:00
blizzz
21d1e5eccc Merge pull request #7930 from owncloud/fix_7785_master 
LDAP: put out fetching of user meta data into a fully tested class of it...
 2014-06-03 19:09:33 +02:00
Jan-Christoph Borchardt
80627dfd2c use Open Sans as typeface 2014-06-03 19:07:08 +02:00
Thomas Müller
8ee15025f0 Fix merge conflict 2014-06-03 19:05:21 +02:00
icewind1991
cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Thomas Müller
e4c3ff03d6 Merge pull request #8809 from owncloud/appconfig-caching 
Improve caching in AppConfig
 2014-06-03 18:59:37 +02:00
Jörn Friedrich Dreyer
b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Morris Jobke
f87a91fa00 Merge pull request #8837 from owncloud/issue/8720 
Fix cursor and background of app navigation
 2014-06-03 16:46:04 +02:00
Bjoern Schiessle
05cf34ea1f get files in trash from file cache 2014-06-03 16:45:11 +02:00
Thomas Müller
cfc1d5623e Merge pull request #8840 from owncloud/share_settings 
by default don't show option to send mail notifications for shares
 2014-06-03 16:42:44 +02:00
Morris Jobke
714b04d06c Merge pull request #8577 from owncloud/apps-sidebar-narrower 
reduce width of app sidebar a bit
 2014-06-03 16:39:41 +02:00
Morris Jobke
73025d6d48 Merge pull request #8843 from owncloud/design-detail-sharedropdown 
fix positioning issue of share dropdown in intermediate widths
 2014-06-03 16:35:31 +02:00
icewind1991
68b15f3282 Merge pull request #7015 from owncloud/db-migration-check-copy 
Check database migration on a copy of the table first
 2014-06-03 16:27:06 +02:00
Morris Jobke
cea7d4961e move to updated version of placeholder 2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt
de38de8ff8 simplify logout and caret icons, remove shadow 2014-06-03 15:59:41 +02:00
Jan-Christoph Borchardt
8a6063ff07 fix text alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt
eace692eff fix icon alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt
9396b22fe3 add missing placeholder shim for change password fields in IE8/9 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt
b67c4b2441 remove tilde selector for IE8 compatibility 2014-06-03 15:30:09 +02:00
Morris Jobke
a63c3311ca remove scruntinizer config for infield 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
46fd40b700 fix show password icon in personal settings 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
4ca665ac10 infield label removal: remove JS file and references to it 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
04aa085292 infield label removal: fix installation screen 2014-06-03 15:30:07 +02:00
Jan-Christoph Borchardt
7177d3a496 first step of infield label removal, fix login screen 2014-06-03 15:28:59 +02:00
Thomas Müller
a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info 
add info about sqlite on setup page
 2014-06-03 15:07:59 +02:00
Thomas Müller
587159c73e Merge pull request #8838 from owncloud/backgroundjob-legacy-gc 
Support having legacy `OC_Cache_FileGlobalGC` background jobs
 2014-06-03 15:06:35 +02:00
Thomas Müller
79b3558c6d Merge pull request #7151 from owncloud/user-jquery 
Continuing the New User management
 2014-06-03 15:04:30 +02:00
Jan-Christoph Borchardt
69e5d5b8c0 remove specific sidebar size from Files app 2014-06-03 13:24:44 +02:00
Jan-Christoph Borchardt
2163951484 reduce width of app sidebar a bit 2014-06-03 13:16:21 +02:00
Jan-Christoph Borchardt
2183b58cdc fix positioning issue of share dropdown in intermediate widths 2014-06-03 13:13:15 +02:00
Arthur Schiwon
e962999896 get rid of @read in PHP doc after rebase 2014-06-03 13:01:14 +02:00
Arthur Schiwon
ba82d80f32 adjust group tests 2014-06-03 12:59:11 +02:00
Arthur Schiwon
3fed96af0e clean up 2014-06-03 12:59:11 +02:00
Arthur Schiwon
f9a9085faf class descriptions 2014-06-03 12:59:10 +02:00
Arthur Schiwon
5336e9a156 newlines 2014-06-03 12:59:10 +02:00
Arthur Schiwon
d52fbd7e55 adjust test to changed convention in storing quota 2014-06-03 12:59:10 +02:00
Arthur Schiwon
342e1fd3bf port of PR #8038 2014-06-03 12:59:10 +02:00
Arthur Schiwon
11f7823e1b precaution: lowercase string for comparison 2014-06-03 12:59:10 +02:00
Arthur Schiwon
e07ebdd7d0 adjust user backend test 2014-06-03 12:59:10 +02:00
Arthur Schiwon
e32fa3de4a fix parameter order 2014-06-03 12:59:10 +02:00
Arthur Schiwon
b0d1b2557c adjust Access test 2014-06-03 12:59:09 +02:00
Arthur Schiwon
6d64d7ec3f LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master 2014-06-03 12:59:09 +02:00
Thomas Müller
2b1a7a76c3 Merge pull request #8425 from owncloud/columns_should_be_nullable_by_default 
columns should be nullable by default
 2014-06-03 12:55:42 +02:00
Thomas Müller
a3202f1f03 bring back the line breaks 2014-06-03 12:48:36 +02:00
Thomas Müller
d60e4b9efa remove +3 in multiselect.js 2014-06-03 12:42:36 +02:00
Jan-Christoph Borchardt
de012667c7 Apps: fix wording and layout for 'enable only for specific groups' 2014-06-03 12:42:36 +02:00
Bart Visscher
49f1e4a811 Fix syntax error 2014-06-03 12:42:36 +02:00
Robin Appelman
0f82b8efb3 Preserve changed groups when switching between apps 2014-06-03 12:42:36 +02:00
Robin Appelman
953e194245 Dont show group settings for login, filesystem, etc apps after enabling them 2014-06-03 12:42:36 +02:00