Robin Appelman
|
091ff02362
|
merge master into filesystem
|
2012-11-08 17:32:00 +01:00 |
Thomas Müller
|
2d52365606
|
Merge pull request #326 from owncloud/add_credits
add credits to personal page too so that non admins can see what they run
|
2012-11-08 05:50:09 -08:00 |
Frank Karlitschek
|
fef2d07873
|
add credits to personal page too so that non admins can see what they run.
|
2012-11-08 14:12:49 +01:00 |
|
Frank Karlitschek
|
f799e48f7e
|
fix the broken image path on the apps page
|
2012-11-08 13:34:00 +01:00 |
Brice Maron
|
fbc3123d8e
|
Correct more data vs attr to fix #189
|
2012-11-07 23:51:00 +00:00 |
|
Robin Appelman
|
961ff01a93
|
merge master into filesystem
|
2012-11-07 17:18:56 +01:00 |
|
Jenkins for ownCloud
|
3e01fe1dbb
|
[tx-robot] updated from transifex
|
2012-11-07 00:02:51 +01:00 |
Felix Moeller
|
a4b2ea586d
|
Style: Remove all the dangling white spaces
|
2012-11-04 22:16:04 +01:00 |
|
Robin Appelman
|
4b940955dd
|
merge master into filesystem
|
2012-11-04 21:12:18 +01:00 |
|
Felix Moeller
|
27ab0357ae
|
Checkstyle: Fix last six NewlineBeforeOpenBrace
|
2012-11-04 18:36:16 +01:00 |
|
Felix Moeller
|
0e70ea9d8b
|
Checkstyle: Fix the last 25 NoSpaceAfterComma
|
2012-11-04 18:28:29 +01:00 |
|
Felix Moeller
|
30d7993e01
|
Checkstyle fixes: NoSpaceAfterComma
|
2012-11-04 11:10:46 +01:00 |
|
Robin Appelman
|
4a5a36577e
|
merge master into filesystem
|
2012-11-02 21:42:29 +01:00 |
|
Felix Moeller
|
afadf93d31
|
Checkstyle: many fixes
|
2012-11-02 19:53:02 +01:00 |
|
Jenkins for ownCloud
|
627509875e
|
[tx-robot] updated from transifex
|
2012-11-02 00:04:59 +01:00 |
|
Robin Appelman
|
51ba12890d
|
Merge branch 'master' into filesystem
|
2012-11-01 16:16:02 +01:00 |
|
Jenkins for ownCloud
|
aca6d3252f
|
[tx-robot] updated from transifex
|
2012-10-31 00:02:32 +01:00 |
|
Robin Appelman
|
6e9e263497
|
merge master into filesystem
|
2012-10-30 22:59:55 +01:00 |
Bart Visscher
|
9318a9566a
|
Merge pull request #136 from scambra/users-fixes
fix settings' routes
|
2012-10-29 15:31:37 -07:00 |
Bart Visscher
|
1bdd0c949b
|
Move and fix app setting navigation detect
|
2012-10-29 15:04:55 +01:00 |
scambra
|
1f0bc1713f
|
fix settings routes
|
2012-10-29 14:50:03 +01:00 |
|
Robin Appelman
|
c4a793913c
|
Merge branch 'master' into filesystem
|
2012-10-28 10:28:25 +01:00 |
|
Jenkins for ownCloud
|
1a08ef6a06
|
[tx-robot] updated from transifex
|
2012-10-28 00:02:29 +02:00 |
|
Robin Appelman
|
38371d1275
|
Merge branch 'master' into filesystem
|
2012-10-27 14:28:24 +02:00 |
|
Bart Visscher
|
0120f3fd62
|
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
|
2012-10-27 11:58:02 +02:00 |
|
Robin Appelman
|
cbc71784c0
|
Merge branch 'master' into filesystem
|
2012-10-27 10:02:26 +02:00 |
|
Jenkins for ownCloud
|
3bef19c623
|
[tx-robot] updated from transifex
|
2012-10-27 00:02:05 +02:00 |
|
Robin Appelman
|
6db81afab9
|
move some stuff to the new api
|
2012-10-26 23:05:02 +02:00 |
|
Robin Appelman
|
4b616764e8
|
Merge branch 'master' into filesystem
|
2012-10-26 22:32:44 +02:00 |
|
Robin Appelman
|
da57fbc93a
|
show/hide navigation entries after enabling/disabling app
|
2012-10-26 20:13:24 +02:00 |
|
Robin Appelman
|
0e2bf8d373
|
Merge branch 'master' into filesystem
|
2012-10-26 10:42:41 +02:00 |
|
Jenkins for ownCloud
|
c7d64811d6
|
[tx-robot] updated from transifex
|
2012-10-26 02:05:56 +02:00 |
|
Robin Appelman
|
7b150dfa96
|
merge master into filesystem
|
2012-10-24 15:32:29 +02:00 |
|
Jenkins for ownCloud
|
f33af71eb0
|
[tx-robot] updated from transifex
|
2012-10-24 02:08:34 +02:00 |
Lukas Reschke
|
95505008ec
|
box-shadow can safely be used without vendor prefixes
|
2012-10-23 23:50:11 +02:00 |
|
Robin Appelman
|
7424f3aef6
|
merge master into filesystem
|
2012-10-23 16:16:46 +02:00 |
|
Jenkins for ownCloud
|
bc2a648f2d
|
[tx-robot] updated from transifex
|
2012-10-23 02:06:03 +02:00 |
|
Robin Appelman
|
5217ca219a
|
Merge branch 'master' into filesystem
|
2012-10-21 15:16:23 +02:00 |
|
Jenkins for ownCloud
|
16c4eb66d7
|
[tx-robot] updated from transifex
|
2012-10-21 02:06:44 +02:00 |
|
Robin Appelman
|
f7722abcb0
|
Merge branch 'master' into filesystem
|
2012-10-20 23:50:14 +02:00 |
|
Jenkins for ownCloud
|
cfbd310d34
|
[tx-robot] updated from transifex
|
2012-10-20 02:03:53 +02:00 |
|
Robin Appelman
|
9712a78559
|
merge master into filesystem
|
2012-10-18 23:24:28 +02:00 |
|
Jenkins for ownCloud
|
519a0ae4ab
|
[tx-robot] updated from transifex
|
2012-10-18 02:09:32 +02:00 |
|
Bart Visscher
|
6081bfa2bc
|
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
|
2012-10-17 16:38:11 +02:00 |
|
Robin Appelman
|
77cef5f514
|
merge master into filesystem
|
2012-10-17 13:14:17 +02:00 |
|
Thomas Mueller
|
1c3a36a079
|
From now on we support two german translation: formal and personal
|
2012-10-16 23:40:14 +02:00 |
|
Jenkins for ownCloud
|
fd6adc7d08
|
[tx-robot] updated from transifex
|
2012-10-16 23:39:13 +02:00 |
|
Jenkins for ownCloud
|
c3823aa864
|
[tx-robot] updated from transifex
|
2012-10-16 02:08:21 +02:00 |
|
Lukas Reschke
|
f4142bd2a8
|
Move isUserVerified to OC_Util
|
2012-10-16 00:47:38 +02:00 |
|
Lukas Reschke
|
c404148f9a
|
Password check for admins
|
2012-10-16 00:47:38 +02:00 |