mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,052 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

11052 Commits

Author SHA1 Message Date
Björn Schießle 40905c8941 fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it 2013-04-18 16:34:23 +02:00
Björn Schießle 7892fddcb9 remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles 2013-04-18 15:44:57 +02:00
Björn Schießle bd3024242f always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change 2013-04-18 15:42:28 +02:00
kondou 79218be1d2 Priorize common languages. 2013-04-18 15:14:42 +02:00
Björn Schießle a646a1169f return filename relative to users file dir and not relative to data dir 2013-04-18 13:41:21 +02:00
Thomas Tanghus 9facb67fab Let autoloader resolve paths under apps lib directory. 2013-04-18 08:30:09 +02:00
Jenkins for ownCloud cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Florin Peter 2434739d69 fix for trashbin 2013-04-18 02:03:03 +02:00
Bernhard Posselt 739d8eb152 Merge pull request #2986 from eMerzh/upgrade_warn 
Warn when we do an upgrade
 2013-04-17 12:43:15 -07:00
Brice Maron 43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Raghu Nayyar a3e5da834b Merge pull request #2925 from owncloud/navigation-icon-fix 
fix navigation hover effect, documentation
 2013-04-17 10:20:36 -07:00
Jan-Christoph Borchardt d83adb8b84 remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px 2013-04-17 17:36:30 +02:00
Jan-Christoph Borchardt 3d47c62a20 apply navigation hover effect directly to img and span, cleaner code 2013-04-17 17:23:12 +02:00
Sam Tuke 6dd8c79461 Development snapshot 
Working on stream{} write
 2013-04-17 17:20:37 +02:00
Jan-Christoph Borchardt c8cafcefe4 move password warning more relevant below password field, un-nest log in warning 2013-04-17 17:16:15 +02:00
Jan-Christoph Borchardt 21bcb95e2a move warning and error states together in CSS, to be cleaned up 2013-04-17 17:15:34 +02:00
Bernhard Posselt 3b2a0523f8 Merge pull request #2978 from owncloud/displayname_can_be_null 
Remove not null constraint. Fix #2976
 2013-04-17 07:47:17 -07:00
Jan-Christoph Borchardt 9f58166339 make textarea inherit ownCloud font instead of using monospace 2013-04-17 16:30:42 +02:00
Morris Jobke 867a527148 Merge pull request #2975 from owncloud/log-date 
use date and time instead of timestamp in log
 2013-04-17 06:49:46 -07:00
Bernhard Posselt 4679e789e1 also adjust template properly for log date fix 2013-04-17 15:31:05 +02:00
Thomas Tanghus 44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Bernhard Posselt 8471340db9 use date and time instead of timestamp 2013-04-17 12:24:18 +02:00
Thomas Tanghus ec280e6f9f Merge pull request #2746 from owncloud/use-count-userexists 
Use count SQL to check for user existance
 2013-04-17 03:06:50 -07:00
Jan-Christoph Borchardt ca323e56c2 correct primary color to #1d2d44 where slightly wrong 2013-04-17 11:55:27 +02:00
Björn Schießle ddde1b65db adapt free space calculation to the way it is done for the trash bin 2013-04-17 10:43:12 +02:00
Björn Schießle a3999036f7 improved free space calculation if no quota is set, discussed in #2936 2013-04-17 10:42:59 +02:00
Bart Visscher f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better 
Handle empty datafolder better.
 2013-04-17 00:44:14 -07:00
Jenkins for ownCloud 37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Robin Appelman 8a50459223 Fix OC_User::getDisplaynames when using numeric user id's 
fixes #2948
 2013-04-17 01:08:27 +02:00
icewind1991 c50dfd7251 Merge pull request #2951 from owncloud/no_personal_variables 
No personal prefixes for variables.
 2013-04-16 15:43:20 -07:00
Bernhard Posselt 7049436058 Merge pull request #2953 from jerrac/emailsavetimeout 
Modified how the #lostpassword or #email fields save email addresses on ...
 2013-04-16 13:56:14 -07:00
David Reagan 0dd6f16e0b Removed extra id from jquery selectors. Remove console.log call. Removed commented code. 2013-04-16 13:22:04 -07:00
David Reagan 6d812ada05 Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event. 2013-04-16 13:03:41 -07:00
Michael Gapczynski 2040f0af78 Merge pull request #2943 from owncloud/always_load_cache_hooks_first 
always connect file cache updater hooks first
 2013-04-16 12:21:09 -07:00
kondou 6ee2b4c740 No personal prefixes for variables. 2013-04-16 19:18:15 +02:00
Sam Tuke f89a3604aa Working on stream{} writing 
Development snapshot
 2013-04-16 18:29:22 +02:00
Bart Visscher 8d1db84ed1 Merge pull request #2887 from owncloud/l10n-caching 
L10N: cache the result of findLanguage
 2013-04-16 09:11:33 -07:00
Sam Tuke 770dcbf663 Fixed stream{} reading of encrypted files (stream_read()) 2013-04-16 14:53:54 +02:00
Sam Tuke b4dd6ae36c Merge pull request #2885 from FlorinPeter/files_encryption 
fix performance issues
 2013-04-16 04:25:59 -07:00
Sam Tuke f378a7f572 Fixed proxy class handing of read / write files 
Various work on other classes
 2013-04-16 13:22:16 +02:00
Jörn Friedrich Dreyer 606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00
Björn Schießle 01d203c773 add explenation of the expire function to the apps description 2013-04-16 12:31:33 +02:00
Björn Schießle 032c54273c write a info message to the log if a file gets removed from the trash bin automatically 2013-04-16 12:31:22 +02:00
kondou 3ab97312b8 Hint to default data directory 
not to before submitted data directory.

Thanks to bartv2 for the heads up.
 2013-04-16 09:54:34 +02:00
Jenkins for ownCloud d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Bernhard Posselt c829a9c156 Merge pull request #2934 from owncloud/shorten_css_colorcodes 
Shorten CSS colorcodes
 2013-04-15 14:46:51 -07:00
Thomas Tanghus 3f7643ef46 Merge pull request #2769 from owncloud/octemplate 
Add octemplate jQuery plugin
 2013-04-15 13:42:35 -07:00
Thomas Tanghus 155582ab70 Updated docs. 2013-04-15 22:10:29 +02:00
kondou 0f86ed3ad5 Shorten CSS colorcodes 
Only need to be three digits.
 2013-04-15 21:07:45 +02:00