Sam Tuke
|
faf6cb0868
|
Merge branch 'master' into files_encryption
|
2013-02-06 18:26:44 +00:00 |
|
Sam Tuke
|
954a627483
|
Added comment
|
2013-02-06 18:24:35 +00:00 |
|
Sam Tuke
|
81de09711b
|
Fixed bug causing password change related hooks to not be called due to ajax
|
2013-02-06 17:42:29 +00:00 |
Thomas Tanghus
|
3879e5d9c5
|
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
|
2013-02-06 08:13:45 -08:00 |
|
Sam Tuke
|
d9631aebfc
|
Merge branch 'master' into files_encryption
|
2013-02-06 16:05:14 +00:00 |
|
Sam Tuke
|
a8c0e3612c
|
Removed call to depreciated isUserVerified()
|
2013-02-06 16:01:43 +00:00 |
Georg Ehrke
|
0a16d25724
|
make it possible to modify the links to the clients
|
2013-02-06 15:20:43 +01:00 |
Björn Schießle
|
e68d0c7398
|
make strings translatable
|
2013-02-06 11:55:19 +01:00 |
|
Björn Schießle
|
9d73e7eb1e
|
let the user change his display name, if supported by the back-end
|
2013-02-06 11:38:03 +01:00 |
Jenkins for ownCloud
|
335b6cd060
|
[tx-robot] updated from transifex
|
2013-02-06 00:06:28 +01:00 |
Arthur Schiwon
|
5221ee0c5a
|
offer change password only when the action is supported by the user backend
|
2013-02-05 19:26:00 +01:00 |
|
Thomas Tanghus
|
cda0780d4b
|
Remove superfluous append
|
2013-02-05 14:15:17 +01:00 |
Jan-Christoph Borchardt
|
2ec0c491d4
|
remove superfluous enabled-app class again
|
2013-02-05 11:30:18 +01:00 |
|
Jan-Christoph Borchardt
|
4059959c5f
|
Merge branch 'master' into fix_addNavigation
|
2013-02-05 11:09:38 +01:00 |
|
Jenkins for ownCloud
|
98f37f4bed
|
[tx-robot] updated from transifex
|
2013-02-05 00:20:29 +01:00 |
|
Thomas Tanghus
|
b06ac67e07
|
Add 'hascontrols' class for content with fixed topbar.
|
2013-02-04 18:30:49 +01:00 |
|
Thomas Mueller
|
6058c2f734
|
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
|
2013-02-04 15:04:26 +01:00 |
|
Thomas Tanghus
|
46e10407f7
|
Remove padding hack to position users list.
|
2013-02-04 14:09:32 +01:00 |
|
Thomas Müller
|
04b97a1906
|
Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
|
2013-02-03 21:55:54 -08:00 |
|
Jenkins for ownCloud
|
da6e79a381
|
[tx-robot] updated from transifex
|
2013-02-04 00:05:52 +01:00 |
|
Thomas Tanghus
|
88ad1e5fbd
|
Make app icon linkable when enabling app.
|
2013-02-03 16:02:25 +01:00 |
|
Jenkins for ownCloud
|
2936140838
|
[tx-robot] updated from transifex
|
2013-02-03 00:06:15 +01:00 |
|
Jenkins for ownCloud
|
b29b55a332
|
[tx-robot] updated from transifex
|
2013-02-02 00:08:15 +01:00 |
|
blizzz
|
88f4aced38
|
Merge pull request #1404 from owncloud/fixing-1276-master
fix #1276 - use registerLoadedCallback()
|
2013-02-01 03:13:23 -08:00 |
|
Thomas Mueller
|
cc73568d68
|
Updateing -> Updating
|
2013-02-01 00:51:00 +01:00 |
|
Thomas Mueller
|
402263bd5c
|
fix #1276 - use registerLoadedCallback()
|
2013-02-01 00:33:14 +01:00 |
|
Jenkins for ownCloud
|
94f7446724
|
[tx-robot] updated from transifex
|
2013-02-01 00:19:28 +01:00 |
Michael Gapczynski
|
a9e1c9bf6d
|
Merge pull request #1351 from owncloud/navigation
New navigation design
|
2013-01-31 14:37:39 -08:00 |
|
Thomas Mueller
|
b1da1db0eb
|
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
|
2013-01-31 23:34:12 +01:00 |
|
Jan-Christoph Borchardt
|
943c0334c1
|
remove z-index from app labels which caused overlap with top bar
|
2013-01-31 20:27:39 +01:00 |
|
Jan-Christoph Borchardt
|
3d5c7ca245
|
Merge branch 'master' into navigation
|
2013-01-31 19:28:25 +01:00 |
Robin Appelman
|
a224d80f4d
|
Sort internal apps above 3rdparty apps
|
2013-01-31 17:49:58 +01:00 |
Lukas Reschke
|
b471177439
|
Merge pull request #1379 from owncloud/improved_appsmanagement
Improved appsmanagement
|
2013-01-31 08:30:55 -08:00 |
|
Thomas Müller
|
0dd9e6cb12
|
Merge pull request #1387 from schiesbn/visual_improvements
small visual improvements
|
2013-01-31 08:30:25 -08:00 |
|
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
|
Jan-Christoph Borchardt
|
ad044eb888
|
Merge branch 'master' into navigation
|
2013-01-31 15:35:20 +01:00 |
|
Thomas Mueller
|
85a12970c7
|
update on translation string
|
2013-01-31 14:11:31 +01:00 |
|
Jan-Christoph Borchardt
|
c801b86bc2
|
Merge pull request #1359 from raghunayyar/navigation
No Image Repetition on Enabling Apps in Navigation Bar
|
2013-01-31 05:01:20 -08:00 |
|
Thomas Mueller
|
3af09f2acf
|
l10n support for the error dialog added
|
2013-01-31 10:43:59 +01:00 |
|
Thomas Mueller
|
8a662a6c74
|
Cleanup string - easier for translators
|
2013-01-31 10:34:54 +01:00 |
|
Björn Schießle
|
170cf20298
|
addapt the css to adjust the change display name filed to the set password field
|
2013-01-31 09:57:16 +01:00 |
raghunayyar
|
b978cc8b28
|
Shorter, Cleaner JS in apps.js
|
2013-01-31 11:52:56 +05:30 |
|
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
Jörn Friedrich Dreyer
|
de00111c1f
|
use on instead of live in users.js
|
2013-01-30 17:49:02 +01:00 |
|
Jörn Friedrich Dreyer
|
22812c5f0d
|
replace live() with on() in core js
|
2013-01-30 17:00:54 +01:00 |
|
Björn Schießle
|
92921ceefd
|
make strings translatable
|
2013-01-30 16:28:41 +01:00 |
Frank Karlitschek
|
ea5861ed8c
|
remove leftover code
|
2013-01-30 15:27:20 +01:00 |
|
Frank Karlitschek
|
5e422dea61
|
fix typo
|
2013-01-30 14:52:35 +01:00 |
|
raghunayyar
|
0dfbd53a6e
|
Reduced Styling and Image loads as from src and not backgorund.
|
2013-01-30 19:12:51 +05:30 |
|
Frank Karlitschek
|
66cab77b6d
|
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
|
2013-01-30 14:36:17 +01:00 |
|
Jan-Christoph Borchardt
|
284e690737
|
Merge branch 'master' into navigation
|
2013-01-30 13:53:43 +01:00 |
|
Frank Karlitschek
|
389c4e8415
|
mark recommended apps. server part not yet fully implemented
|
2013-01-30 13:39:53 +01:00 |
|
Jenkins for ownCloud
|
68266e70f2
|
[tx-robot] updated from transifex
|
2013-01-30 00:25:41 +01:00 |
|
Lukas Reschke
|
a7aff48658
|
Fix indentation
|
2013-01-30 00:17:41 +01:00 |
|
Lukas Reschke
|
0067ac6ca6
|
Remove the no longer existing function "isUserVerified"
Thx @eMerzh
|
2013-01-30 00:16:37 +01:00 |
|
Lukas Reschke
|
250c565d2b
|
Merge pull request #1360 from owncloud/display_name
introduction of display names
|
2013-01-29 14:05:54 -08:00 |
|
Björn Schießle
|
6659798197
|
only change display name if the display name from the current user was changed; add correct display name to new user
|
2013-01-29 22:33:46 +01:00 |
|
Björn Schießle
|
56c6e6a334
|
remove debug output
|
2013-01-29 22:20:47 +01:00 |
|
Björn Schießle
|
afad6e95db
|
check permissions before changing the display name
|
2013-01-29 22:20:15 +01:00 |
|
Björn Schießle
|
27edbfdf56
|
added missing changedisplayname.php
|
2013-01-29 21:52:03 +01:00 |
|
Björn Schießle
|
e613a68274
|
remove dubug output
|
2013-01-29 21:30:04 +01:00 |
|
Björn Schießle
|
8d0b67e17a
|
fix typo in variable name
|
2013-01-29 21:04:11 +01:00 |
|
raghunayyar
|
d620495e92
|
No Image Repetition on Enabling Apps in Navigation Bar
|
2013-01-30 00:54:23 +05:30 |
|
Jan-Christoph Borchardt
|
3bafa87a12
|
merge styles
|
2013-01-28 19:36:21 +01:00 |
|
Björn Schießle
|
4b7b092008
|
rename Name to Login Name
|
2013-01-28 17:05:20 +01:00 |
|
Björn Schießle
|
f3a99f4869
|
show display name in input field
|
2013-01-28 17:01:37 +01:00 |
|
Björn Schießle
|
e0f2ed2757
|
interface and API to change display names
|
2013-01-28 14:09:11 +01:00 |
|
Björn Schießle
|
022a7b13b8
|
prepare user table to show and edit display names
|
2013-01-28 13:12:44 +01:00 |
|
Jan-Christoph Borchardt
|
329d965441
|
merge changes in navigation
|
2013-01-28 10:52:15 +01:00 |
|
Jenkins for ownCloud
|
b655444709
|
[tx-robot] updated from transifex
|
2013-01-28 00:05:43 +01:00 |
|
Jenkins for ownCloud
|
00a28062e1
|
[tx-robot] updated from transifex
|
2013-01-27 00:06:21 +01:00 |
|
Thomas Müller
|
276d98b9dd
|
Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
|
2013-01-26 04:15:40 -08:00 |
|
Jenkins for ownCloud
|
af4411e33d
|
[tx-robot] updated from transifex
|
2013-01-26 00:10:07 +01:00 |
|
Björn Schießle
|
19024de988
|
typo fixed
|
2013-01-25 17:44:40 +01:00 |
|
Lukas Reschke
|
047f1988c3
|
Merge branch 'master' into no-inline-js
|
2013-01-25 16:11:07 +01:00 |
|
raghunayyar
|
aed204d420
|
Defined height for #leftcontent
|
2013-01-25 20:39:07 +05:30 |
|
Björn Schießle
|
64e853394c
|
compare the correct uids
|
2013-01-25 12:46:32 +01:00 |
|
Björn Schießle
|
4271430e60
|
get all display names from users in a given group
|
2013-01-25 11:48:03 +01:00 |
|
Björn Schießle
|
9bb8e05839
|
get all display names
|
2013-01-25 11:05:00 +01:00 |
|
Jenkins for ownCloud
|
6832dddf39
|
[tx-robot] updated from transifex
|
2013-01-25 00:05:56 +01:00 |
|
Lukas Reschke
|
c8bbbb48d3
|
Merge master...
|
2013-01-23 11:30:40 +01:00 |
|
Lukas Reschke
|
48949ba04a
|
Move appid to external file
|
2013-01-23 11:21:34 +01:00 |
|
Jenkins for ownCloud
|
c986dbe573
|
[tx-robot] updated from transifex
|
2013-01-23 00:06:18 +01:00 |
|
Lukas Reschke
|
8907bdaf7f
|
Remove uneeded JS
|
2013-01-22 12:15:46 +01:00 |
|
Lukas Reschke
|
bd5ff29716
|
Merge branch 'master' into no-inline-js
|
2013-01-22 11:50:33 +01:00 |
|
Lukas Reschke
|
d2383338de
|
External JSON for the Apps
|
2013-01-21 22:18:42 +01:00 |
|
Lukas Reschke
|
30274ee33e
|
Move to OC_App
|
2013-01-21 22:18:11 +01:00 |
|
Lukas Reschke
|
3ed7d5d521
|
Move isadmin to external file
|
2013-01-21 21:25:38 +01:00 |
|
Frank Karlitschek
|
a27f92a17a
|
we are getting closer. updating is not working yet.
|
2013-01-21 20:40:23 +01:00 |
|
Jenkins for ownCloud
|
aede26d996
|
[tx-robot] updated from transifex
|
2013-01-21 00:05:34 +01:00 |
|
Jenkins for ownCloud
|
ebc0c4b85b
|
[tx-robot] updated from transifex
|
2013-01-20 00:06:40 +01:00 |
|
Thomas Mueller
|
afb5de955e
|
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
|
2013-01-18 23:22:34 +01:00 |
|
Jan-Christoph Borchardt
|
b81a7aa078
|
fix up content and content-wrapper merge ...
|
2013-01-18 19:58:50 +07:00 |
|
Jenkins for ownCloud
|
824fcf6624
|
[tx-robot] updated from transifex
|
2013-01-18 00:04:36 +01:00 |
|
Jan-Christoph Borchardt
|
09d3db5eb7
|
new settings menu for new design
|
2013-01-17 12:45:33 +07:00 |
Bart Visscher
|
a8f963d9cf
|
Spaces to tabs
|
2013-01-16 18:09:16 +01:00 |
Daniel Molkentin
|
65ef780ed6
|
Fix regression caused by 31b1a73e1f
|
2013-01-15 22:44:40 +01:00 |
|
Bart Visscher
|
0da06187f6
|
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Fixing unused and undefined in master
|
2013-01-15 07:45:51 -08:00 |
|
Jenkins for ownCloud
|
fdd667a83c
|
[tx-robot] updated from transifex
|
2013-01-15 00:05:10 +01:00 |
|
Thomas Mueller
|
388bb6a5e1
|
Merge branch 'master' into fixing-unused-and-undefined-in-master
|
2013-01-14 23:41:34 +01:00 |