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

1715 commits

Author SHA1 Message Date
Jenkins for ownCloud
e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Jenkins for ownCloud
baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Morris Jobke
9e74787c8a Migrate table layout to p layout for share settings 
ref #8906
 2014-06-17 14:33:14 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Volkan Gezer
dd2dd7eaae Merge pull request #9059 from owncloud/simplify-warning-layout 
simplify security warning on admin page
 2014-06-16 21:30:46 +02:00
Morris Jobke
a5f1846170 simplify security warning on admin page 2014-06-16 20:25:02 +02:00
Morris Jobke
c42d087fc5 Merge pull request #9053 from owncloud/small_ux_improvement 
share settings, small ux improvement
 2014-06-16 20:18:51 +02:00
Georg Ehrke
15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore 
Make shipped apps updatable via appstore
 2014-06-16 15:54:50 +02:00
Bjoern Schiessle
c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Arthur Schiwon
f12c4f6d11 style 2014-06-16 13:46:31 +02:00
Arthur Schiwon
3ebb1565a7 escape before output, fixes #9041 2014-06-16 13:44:41 +02:00
Volkan Gezer
83b45926ee Merge pull request #8716 from owncloud/forget-documentation 
app manager forgets the documentation links workaround for #8081
 2014-06-16 12:24:39 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud
4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Lukas Reschke
01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https 
migrate table layout to paragraph layout for HTTPS setting
 2014-06-14 13:08:58 +02:00
Jenkins for ownCloud
4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Morris Jobke
fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Georg Ehrke
c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Morris Jobke
dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke
f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Morris Jobke
ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders 
fix split translations. fix for the discussion in the description
 2014-06-10 10:47:23 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Volkan Gezer
e34a8bb9d6 fix hidden user group search field 2014-06-07 21:12:12 +02:00
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Volkan Gezer
f56b86e857 fix split translations 2014-06-06 15:31:51 +02:00
Volkan Gezer
6f3b95052f app manager forgets the documentation links 2014-06-06 15:22:02 +02:00
Jan-Christoph Borchardt
23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Thomas Müller
289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe 
Mobile sidebar swipe
 2014-06-06 11:27:04 +02:00
Jan-Christoph Borchardt
1745fe1664 Merge pull request #8911 from owncloud/common-lang 
Add Turkish to common languages
 2014-06-06 09:38:10 +02:00
Jenkins for ownCloud
ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Georg Ehrke
0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
 2014-06-05 22:54:27 +02:00
Volkan Gezer
11a857f653 Add Turkish to common languages 2014-06-05 22:32:35 +02:00
Jan-Christoph Borchardt
9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle
cf9099c788 This settings doesn't belong together 
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
 2014-06-05 15:44:56 +02:00
Bjoern Schiessle
c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Thomas Müller
1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two 
Toggle app navigation not only on mobile, but on desktop as well
 2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt
218131d30d fix leading decimal Scrutinizer coding style issue 2014-06-05 10:52:06 +02:00
Jenkins for ownCloud
cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Morris Jobke
39eeb7def9 Merge pull request #8882 from owncloud/remove-placeholdercall 
remove obsolete placeholder call, fix #8881
 2014-06-05 00:07:13 +02:00
Jan-Christoph Borchardt
e26936e94f remove obsolete placeholder call, fix #8881 2014-06-04 18:44:12 +02:00
Morris Jobke
210a1ef7e6 add to app navigation after enabling 2014-06-04 18:22:40 +02:00
Jan-Christoph Borchardt
71ba457372 personal settings: unbold clients header and remove obsolete CSS 2014-06-04 17:05:44 +02:00
Georg Ehrke
724d027f19 add unit test 2014-06-04 16:29:41 +02:00
Jan-Christoph Borchardt
bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00